Sofia redone + Map fixes.