Add '%c' and '%s' parsing functions + comments