Improving initialization by adding h2spatial commits

I think it's valuable to keep the commits with us, so I'll try to do it every time... howvere, it will probably be more difficult for those from h2 :-(