tweaks and typos