fixed some minor things
Merge branch 'latest'