more fixes and doc updates