Update from early tubes with bugs, to tubes with less bugs and more features based on feedback.
Merge pull request #2579 from Uristqwerty/tube-update

Update from early tubes with bugs...