Fixed the highlight thing and updated entity references