linted
new parser!
improved parser