cleaned up a few minor things