first round of edits

please review @kbastani @jexp 

I tried not to change it too much...
The dash is intentional as it is part of the datamodel :)