Improved the example window program that was just merged.