Knocked off a ton of errors; formatted a couple files