fixups
add spatial indexes, barely started