Various style and functionality improvements.