Fixes to all current overlays and additional overlays created