types: add resource id types, some fix ups