Help improvements (2), Preparation scripts code improvements (5)