typos, cleanup unused, bug in flush_queue
bad hack to fix hello_reply bug