cleaning up some mistakes