Comments and TODOs

Updates after meeting with Gray 11.13