added kill command and cleanup