minor fixes here and there
Merge branch 'curtis'