Some changes from glob's first feedback