minor adjustments and corrections
Merge pull request #117 from cordoval/feature/contribution-friend

Fixes, tweaks and enhancements in lots of files