Yep, I'll update those two suggestions.