Cleanup, including #93 and some minor display changes.