Fixed doc issue
Fixed bugs