Some fixes
Merge remote-tracking branch 'origin/greg2'
last commit of this day
padding et string propres holala la folie