messed up push/pull, ex3 changes based on prof comments