Correct bugs and add the crc system