This is what I got done last night, still some more to go
Merge pull request #4 from emajewicz/Monday_Tweaks

This is what I got done last night, still some more to go