Fixed problem with card validation and added some todos