Fix some map and vectors, havn't finished preprocess/process