many small updates