However, all this needs more testing.

Also, a bit of a purge of training whitespace and global .