Finalized highlihgting, fixed clearlines