Added dataset get flag to return internal IDs and added tests
tweaked clustering