Output fix

Vigeesh Gangadharanrequested to merge
output-fix into develop

clean and fixes most of the issues related to the output format

Merge request reports