Use higher-res data

Also remove some silly things I did with perimeter that don't make sense.