fix comment parsing and add raw parsing