update: update to latest upstream, inc 20 keys