Animation tweaks and additional delegate callbacks