animation improvements, generation fixes