Peep location

Fixes some bugs in finding peep's location from a news item, and tidies up the code a bit.