deleted some FIXMEs to reflect outcome of the discussion on issue #42