Add coments & some fixed