improved commenting and narrative