Update on the readme-file and some name updates in the function