Issue103

This should resolve Mark's 3 items in Issue 103.