Fix some Twosome animations
Makefile improvements