merge branch 'speed-improvements'
redone: parser: fix optimise error check
*: small improvements