Clean up and starting more features.