Fix some copy&paste errors and update following review feedback