Minor changes
Rearrangement of subsections
Updating main file