fixed some parsing stuff