minor cleanups, added one FIXME