fixed some inconsistencies
a few more inconsistencies
Merge branch 'master' of https://github.com/stefan-loewe/Woody