missing case in 'fun' macro
fixes bug in contract conjunctions
  -- caused by typo...
patches custom contract bug, adds test