typos, fixes, improvements