updates for "0.9.5"

Various renaming, refactoring, fixes, and additions in preparation for a "0.9.5" release.