Tidy up small dragon.
Fix more black.
Fix more glitches.
Merge remote-tracking branch 'origin/master'