adjustments various
Merge pull request #3 from cordoval/feature/adjustments

[RFC] adjustments various