Minor re-ordering and fixing
Descriptor parsing stuff
More fixups