I'll fix your first point. I believe the latter is a separate expectation, which I'll cover (was untested as well).