fixes and doc