Query parser much more robust
Help message typo
Clean up