removed a ton more map variables, we're down from 105 to 86 vars!