added TODOs, changed output