* A lot more fixes from the inimitable @isaachen