Adding some FIXME remarks, cosmetics...