Further overlays and tweaking