start editing

Just testing that editing stuff and committing it works properly...
cleaning and explaining

in progress
Merge pull request #1182 from chaals/master

in progress...