Minor changes in Output. Input WIP.