little changes
changes primarily to FullPushPullModel
DSA
resolved merge conflicts