more updates and trimmings