fixed up some things