[2pc] solved most of the bugs