fix parsing error and add in some missing overlays.