Fixing some module bugs
Shipping ports module continued