Updated documentation and other stuffs