added a couple of FIXMEs
added a couple of FIXMEs