fix trims
parser update