map and simulator fix
merge