Kee/Maranga fix, Knock off improvements
.
Merge pull request #954 from Fuzzysqurl/fixes

Kee/Maranga fix, Knock off improvements