correct some inconsistency and added the hype mode line number.