final changes

mixed last of Romka's edits that went to main release in, is all
Merge pull request #226 from JoyStipe/main

final changes