uint_to_string macro updated, main file updated