Fix count and offset.  Some clean up in the parse function.  Add missing functions in Query class for adding things.