parsing bugfixes and some comments