added cpu movement and highlighting
fixed conflicts