few more tweaks; ready for Greg