fixed some FIXMEs