minor animation fixes and cleanup