Corrections and COmmandLine tools