added some FIXMEs