Minor improvements and adding of some documentations