-bug fixes
-changed some error messages