Finally fixed the cursor bug, + also fixed duplication

Duplication actually hadn't been working since the transition to
GeometryShapes. Fixed now.