fixed a couple of highlighted bugs