Fixed some parse bugs
Fixed some parse bugs