Adding info on composer and improving highlighting