Finished some TODO and added two small bugfixes

Merge request reports

Loading