Resolved some parsing bugs