More work on the city generator

ironing out some issues, made glueing more robust