add comments to templates, clean up some makrup
add content for no results, add comments to templates, clean up some functions