More changes as merging with theBear and gcs proceeds