Committed all changes from 2-Weeks Softube consultation.