update patch
fix formatting so that patch does not complain
update backported patch to v2