Formatting of results better, Comments better