fixed crc, refactor formup