Bug fixed + Restart option
Code cleaning