fixing bugs - trying to get model2 to work
now using new smaller map + more bug fixes