Code highlight and other minor changes