Various improvements + EaseInOut