fix bug and add more animation

please merge with master