Reverted  some changes to files outside of section_tool, that were somehow flagged as modified in this pull request. Essentially I recopied the original files from develop