tweaked a few minor things