One more fix needed to fix wrapping-- draw_calls all need to be calculated after all string substitutions have been made.