fixes and doc updates