Fixed overlays not being delayed and improving some readability