Cleanup, doc fixes