more bugs fixed

love those last minute bugs