Make transporter private and fix small issues