More titivation, minor fixes/typos