Uncovering some subtle bugs - more next weekend.