#6 #8 Fix restart status message, fix restart state end condition