Tweaking strip stuff and some anims
Unbreaking master