Tighten up some threading and add my own photo renderer.