Further identifier-related updates; add fully versioned ids
Further minor corrections