corrected some FIXMEs