Change in-file documentation and run DiffNow to identify remaining TODO

Left TODO
*insert commas into string builders for keywords and members