Sorry, but the next series of commits are going to be small ones, because rapid bug finding+eliminating.