Misc. edits during meeting with Jim and Matt