updated comments and fixed casing on id