Several small updates.