more parsing bugfixes