Fixed/Added some card punching related stuff