- cleanup some bugs with the composite parser, and add many tests