updating to latest upstream versions