more work
misc fixes
bump version
nits
nits