small syntax fixes and FunnelNode.matches