Fields, cards added. Some fixes