fixed different functions, added remanining functionalities until step 3

Merge request reports

Loading