cleanup and docs additions