typo fixes, fleshed out 18, added 19 and 20