Multiple enhancements
Fix readme, funnel module changed