Added some extra error checking and made a couple minor parsing