various fixes
doco fix