update order, animation tweaks