Add recent fixes and arch additions from hexedpackets@github