fixed some stuff, try highlighting