Overlays and various fixes