minor corrections after merge