Some minor adjustments for strings fetching and updated source strings