Made a few more tweaks, how's this going? Let me know if anything isn't working that was working before we did the server code upgrade.

More...