optionally include source contents in the results
fix trailing whitespace