Fixing parser bugs.  Adjusting API.  Updating.