improved mapchange; minor error fixes