Added %c (non-repeating), untested
Added %s to non-repeating, untested