bug fixes
document fixes and update version
Merge branch 'develop' into feature/extras
tweaks