Some formatting fixes and copy fixes
Merge pull request #474 from konklone/fixes

Some formatting fixes and copy fixes