More cleanup, and pretty listings

hmm, the IP shouldn't be harcoded, template it too? e.g. `\loginnodeip`?