Added some changes to error messages and such
Cleanup