added TODOs: suggestions from Dennis Hoer