Minor updates to commenting and various changes with regards to the update to Viaduct as a framework