Cleanups and updated documentation.