Updated the header and some infos