switched to using the __COUNTER__ macro if possible (which breaks stuff which will be fixed soon)

before transition to map from vector