Bug fixing
Bug fixing and doc init