bugfixes for parser and reworking block upload