removed and added TODOs. At some points I'm not sure, if those things are handled. But I wrote that in the TODOs. If they are handled, the comments can be removed. And I fixed a compiler warning.