GCD/CD fixes

* Fix GCD/CD spirals
* Add option to enable / disable GCD spiral edge (yellow spark)