fix mod indexing

refactored the map into a vector, to REALLY avoid conflicts.