Fix declarations in building_writer.cc
Tweak building clustering (make it stronger)
Tweak clustering factor again.