Issue #18 and sundry UI updates.