Fixed typos and some inconsistency