work off some FIXMEs