Updating: renaming a file.
Updating: fixing a glitch in staloading extcode from sats-files.
Updating: minor.
merge
Cleaned up the extra include flags