Split home and protocol; improve printability (maybe it's an improvement... maybe not)