Bug fixes and minor UI brushups.