Fixes the parser. Only promise stuff left to handle