some last minute bugs