v0.4 fewer bugs this time