typos, tweaks and fixes