Fix a bug, Improve text formatting