fixed some more errors
Merge branch 'john'