fixes from list, fix animation