lots of UI tweaks, and I may have fixed a bug or two.