fixes #1
fixes #5
fixes #2
fixes #3
design touch ups
Merge pull request #16 from mikesall/ms-fixes

Ms fixes