Added some informations & other small modifs