removed FIXME and TODO items and moved them to issues