Miscellaneous typos/fixes