different parser + bug fixes