minor new code / tweaks