Fixed some minor things