Better map loading. Some profile fixes