fixed some bugs may cause some bugs see LoadMe need to remove some entries