Animations
Merging
Small other tweaks
Fixing controller support
Merged