single keyframe bug and other fixes