Fix non-standard uid and expires.  And this library was creating a timestamp for expires where the spec clearly states (seconds)expires_in should be used and this has been corrected.