Minor api visual improvements and a parsing bug fix