Add ata form working and other improvements