removed some old FIXME comments (now fixed).