improve the integrity checking tools;  support more features