Fixed lots of minor things