Adds comments, fixes stylecop issues