Couple of fixes. Q can fix the rest