Fixed a few parsing stuff