more parsing bugfixes
more parsing bugfixes