Correct some bugs and add the crc system