Issue #3, better token refreshing, added new methods