Add string_format(); Other minor changes.