Added big round of data changes, fixed one highlighting bug.