More changes...

None of which have any effect on the program yet...