New 3

All bugs are fixed, all "const" are added;