Workable commit

Out of bugfix zone, almost. Everything except payment, address
validation, vardiff and IP ban