Added combine hostname, making separate/combine a toggle. Various
polishings and bugfixes.