final tweaks from jarrod.