Improved animations a bit (and added back missing file from previous commits)