General control fixes, re-added old animations