add some fixme's