solved todo
fixed escaping and crc