more tweaks/typos