fixed error messages and removed old commented code