fixed system-name bug in name list; +performance
map_contians now with pointer - perf. boost