fixes + animation