fixed random fixes to logic , don't need to log most of these