fix last minute bugs