General enhancements.

I think this makes it a lot better.