more fixes and doc update