fix parsing and add missing overlays