Yes you are right(on all fronts).
Cheers