Fixed typos and added --no-mismatch