Bugs and comments fixed

Merge request reports

Loading