Multiple Fixes

This has a multitude of commits I used to fix up the module for my use. I'm not really expecting anyone to merge this, more to start a discussion on which groups would go in which PRs. I'm happy to regroup and rebase and stuff. Also, why no $osfamily ? I left that unchanged because I figured someone had a reason. 


Thanks,
Spencer