Added BUFFERED_RECV in MULTI_RECV and cleaned up code