fixes #127
fixes #130
fixes #117
fixes #124
fixes #124
Merge pull request #132 from royrusso/_99_2

 99 2