fix some transition bugs & add transition feature