fix some stuff and machine this the default checker