More tweaks and doc updates