added TODOs and FIXMEs