Fixing animation, settings bugs