Update of documentation and code