Running the tests helps
Touching up a few logged errors