Made output cleaner and removed some TODO comments, also inculded IO and RdWr