some cleanup
fixed error message