Shortens stopped tube time and cleans up a bit