fixes and doc changes