Fix highlighting problem & add str numbers in code