work in progress on identification, identifiers (and minor cleanup)