Improvements to fast mode and cleanup.