Master -> dev merge

Maaaay have not carried over some of map fixes from master, since it had lots of conflicts and new object paths. Cargo and areas seem to be the same now though.