Fixed restart bug.
Fixed restart bug and added messages.