Added a restart command.  Cleaned up imports and other source code messes.