Additional bug fixes and animation tweaks