Cleanups, documentation