half of parser

+bugfixes