Add restart always option + some comments.