Fixes issues with connors merge and tidies up comments a little.