For #2 "переделать" also may fit.