fix expired? and add expires_in?