Minor cleanup, added stop command