Added several minor things