Fix spire addressing, make ordering consistently counterclockwise