Better overlays
overlay fix
fix
Cleanup