tweaks to CC turtle PR to fit into new addon system