fixed black knights.
Merge remote-tracking branch 'origin/unstableControls' into unstable