fix: some parsing bugs