updated anims
Merged

lots n lots
scale, input, anim etc