local fixes
merge master
updated docs and options for automated install