cleaned up some mistakes