Overlay,various fixes