More animation fixes and general tomfoolery.