More tweaks to laser scaling