fixed overlays + clean up