Code runned trough StyleCop and some bugs fixed
Functionality on Restart added.