minor parser & api improvements