Added docs and change some features