Better handling of unknonw maps

Also added magisters terrace