some code comments
some important fix
some minor fix. make the range larger 5000??->6000?