Fix indenting and bad comments, log addition info about querying