fixed some bugs and changed animation