added john format. edited .cnf