V060

Various improvements to address #44 and #45.