fixing last minute bugs