made things more consistent with the new haskell implementation