minor fixes
bug fixes
"added check on load map"