laser.yaml now looks for mappings under mappings: and other fixes