more fixes to handle missing 'expiresIn'
[derp] fix forkbomb
cleanup key use to work with new api