more cleanup work
fixing some hard to find issues
merging files
Merge pull request #40 from pstephen43/master

sync up