Bug fixes & new scaffolding for keyframing