Added documentation notes
Merged some comments in query.java