add some FIXMEs