feature/456: corrections on the code.