pulled a few last functions out of the modules;
Merge pull request #194 from caseysoftware/master

More function cleanup