Updated error messages
fixing formatting issues
Added more features