tweaks to various things
Merge pull request #88 from kmazanec/style_tweaks

tweaks to various things