CRM complete + massive fixes all over