sorted out stop/start/restart, and cleaned up logging