typos, fixes, layout