more fixes from submission review