update overlays
Fix for 4.2
General tweaking