Minor Tweaks. Logging is probably a bit extreme at the moment, but that can be scaled back later.