Further code & animation optimizations