Error Messages and other minor changes