adding Devin edits + minor syntax fixing