updated parser & sources