small tweaks, additional examples, and haskell solution