Minor changes, vector initial capacities.