Minor main functionality enhancements.