small changes, mostly to the push pull code