fixed so last minute bugs