fix null pointer on Nick remove
fix stupid bug in hilight detection ...