Updated some minor things in code