Cleanup and feature additions.