fixed bugs, added more transitions