Displaying the results in a table and some other minor fixes