Better OAuth token storage, more message/upload logic.