Cleaned up server code, minor game improvements