From Wliu to @Lawdy with no love

Also stuff to cbs and administrator's cfgs
And of course more formatting