Update text, fix some code formatting