Circular data & cross references #110

Syntax fixes