Counter fixed, clean more code and advances in current shipment logic