updated docs and minor fix for expires_at