Various updates, mostly rust