outputfile renamed; updated TODO