made more changes to handling PULL from server