Enhancements.

I'm too lazy now.