minor misc. fixes
Merge pull request #773 from m3g9tr0n/minor-tweaks

minor misc. fixes