I think he gave up too early, if he held up a bit longer I bet he would have better terms as he was literally testing their patiences. Plus he's going back to Australia, like WTF they aren't that much better then the U.S.
From what I read it's all done. He was sentenced to "time served." If that's true, they may not specify what counts. In other words, the embassy time might not count. Probably just since the extradition started.