Add quant
Add task Id to log messages in parsing
Some minor improvements