removed several FIXME's.