wip: refactor: descriptor tweaks
wip: odds and ends