Fixing most bugs on aug 29 4:00pm