only that one animation bug remains...