animations, fixes

Change-Id: I02e36ef6925c42ae6dea2af9939a2527dcb43ad1