Small fixes and better user experience (bingo!).