[@Arminwraith]

Accepted, with a couple of tweaks PM'd, but good to go in chars and then you can jump into the IC.