More progress and debugging