Discrimination fixes - do it right and don't remove from the classic game feel

[Littlerascal-area-52]

Oh my! This is showing signs of developing into an excellent show!