update flip animations, clean up logic