#419, #420: clarify locations
#419, #420: tidy