Bugfixes and UX improvements.
