cleaned up some errors