clean code and add some buffer animation fixes
fix buffer animtation