more string formatting fixes