Added pushdir, pulldir; updated push and pull