do things the non-dumb way, fix some typos etc