Some new settings items and implementation for them. Some minor enhancements.