-Fixed a lot of logging issues
-Fixed a lot of error handling