Added user delight. Also did some QA, which made me make some changes to catch unusual scenarios