Removed more bugs and error messages