Revert "different fixes after review"
Merge pull request #2 from alexk-blackops/revert-1-dev2

Revert "different fixes after review"