more() and waitnl() reworked.