more tweaks from spence
more tweaks from spence