Added maps, made "notes" optional.