start adding capacity + minor changes