yep... those were right!

sorry about the confusion on the first question