typos, clean up etc.