Added map to vector array method, fixed errors in macros.