Fix animation sync issues, whitespaces