Castor geometry update

Overlap fixes and update for castor geometry.