Add error messages management + progress bar + code fixes + todo updated