Post review revisions

Fixing the items we commented on in today's code review @bryceallison  except for that multi_json problem.