Changes to setting position of things in map

More testing is required, but this hopefully will fix issue #55...