Fixed a few bugs, really need to figure a standard for detecting which peices of code to run as the client/server