* Added more error handling and fixed compiler error strings