Adding comments
Fix parameter error
Adding TODO
Commenting Query class