Updated a few FIXME's

and added a TODO