Preview Rapport + Some corrections