Further race card improvements