added TODOs and fixed line endings