Add checksum support and strip comments