Cleanup

Tweaked a few things, cleaned up some errors, et cetera