Updates

I made a mess. This tidies a bit.