fixed a few things, added hilighting