Some minor server/client changes to allow subclassing
Removed refresh rate hack, need a better way...