Add @peterboyos latest optimisations. Fix JCB and Discover card sprite generation