zip: few CS touch ups.