Fixed some potential errors, but so far they have not fixed my main parsing problems.