Fixes
Fixes from proof reading