Finishing keyframes covering + raw content bug fix