Refactored.
IO and UI tweaks