delete old thrift generator script
fix PE hacks, and add another JP hack
fix extra relations file
santa cruz de tenerife, again
pick shortest shortened name
santa cruz