tightened up some values