Code

copyedit, typos, slightly better default values