improved highlighting, but not finished
fixed highlighting
better cleanup