More loggin's
Cleaning some things up and fixing a race condition