basic parsing (not fully tested) and fix of comments parsing