bug fixes and doc updates
doc update