Fixed various bugs surrounding control_handler.  Started tracking things in server_table in a dict.