Parser now fill matrix + comments