Better logging
Killed off warnings
Killed off some Warnings
Cleanups