Fixing string functions and renamed keyword variables