Updates, mostly to API