Made a few tweaks to the IO.