Fixup shuffling and tweak animations
Merge branch 'master' of https://github.com/djpark/Reunion