Various updates, mostly untested