clean-up and doc updates