Started extending animations, minor bugfixes.