more expiry date stuff, slot availability bug fix