tightened up some stuff