improvements and bug-fixes (see log and Github issues)

closes #144
closes #148
closes #149
closes #155
closes #157
closes #159
closes #160
closes #161