Circular data & cross references #110

Mostly syntax fixes.