Feature/better debugging

I cleaned up the debugging and logger a bit. This will help me isolate some errors in my implementation.