Fixed bugs and changed code structure.

I fixed the bugs that were preventing the code from working for all
players.  I also merged the Admin and User debug into one file to keep
it tidy.  Everything has been tested and works 100% on my server.