Included Ben's feedback
13 files changed