Almost back up to full swing

Everything is nearly back to the way it was before the server dive. All of the public issues should now have been sorted, but please let me know if you find any problems.