last minute bugs fixed