more tweaks to Carrier lamp, almost there.