Some housecleaning and enhancements.