just tweaked a few minor things