added a few feedback and adjusted transitions