Some cleanup, tests added, renamed to runio.