Adding final touches to restart, cleanup and updates