Removed TODOs, renamed readCount->rc, wrapped->reader