thesis: Add FIXMEs and TODOs to the first 2 chapters