Update to exploding, and general stuff... been too long to remember the
details...