Small fixes
Fix typos
Fix additional inconsistencies