This paper reports on several developments of X-ray fluorescence techniques for macromolecular crystallography recently implemented at the National Institute of General Medical Sciences and National Cancer Institute beamlines at the Advanced Photon Source. These include (i) three-band on-the-fly energy scanning around absorption edges with adaptive positioning of the fine-step band calculated from a coarse pass; (ii) on-the-fly X-ray fluorescence rastering over rectangular domains for locating small and invisible crystals with a shuttle-scanning option for increased speed; (iii) fluorescence rastering over user-specified multi-segmented polygons; and (iv) automatic signal optimization for reduced radiation damage of samples.