Some cleanup, some features.