Fixed the Card Reader to validate by calendar. plus other minor fixes.