4.2 geyser fix & touch-up