more polishing on Maritime Trade Controller