Cleanup and additional small features.