Minor tweaks and fixed typos