minor fixes and lots of FIXME's added