Map fixes

Fix issue where points wouldn't display; also issue where clicking an object wouldn't display the correct data;