More improvements to castep go.