Fixes and Animation Updates