Misc Bugfixes, Error Trapping