improved overlays and refactorings