fixing animation, some small bugs