fixed and did some more tweaks to get the descriptors to a state of what I think WILL be possible