add descriptors...

Adding descriptors and making a few naming changes to insure the code
runs correctly without Synapse. Next will be to generate some sample
data and run without O4 and the espace constructs.