Some minor cleanups and display stuff.
nm