Fiddling about to fix everything

It's pretty much done now. Just a bit of server-side code remaining.
Maybe some user-facing polish.