Cleaning up inline questions
Lots of updates based on Justin feedback, plus vendor options