Render with caustics map included, something in my specular mult/prob calculation is wrong, resulting in all this noise.

Render without caustics but with final gathering.

Direct + Indirect light done with photon mapping.

Reworked my code and this is my attempt at direct lighting only with the photon map. When I add bounces I get a lot of random bright circles but the caustics look good.

Current try at photon mapping for direct and indirect illumination.