Adds more code and doc cleanup.