Final updates to fix rendering and animation issues