Issue #15 and various other UI and data updates.