Misc. cleanups, better display and rendering support in config file, etc.
Merged changes.