[ADD] some fixes & improvements of main

Merge request reports

Loading