Various bug and UX fixes.