Further clustering work and debugging.