Updated Rapport, bugs and DRY code