Resolved #3 and #6

Also added features to read from FUNCTIONS FILE for the new sections.
Also, did some minor tweaking with the control spacing.