Fixed some bugs, simplified parsing.