Bug fixes and UX imprvements.