Some bugs squashed, more to go.