Mega PR to address #194.
Decided to start one pr to stop many of these non logic impacting changes having to be merged. Anyone feel free to merge into this one.
State: As of f4734455 we are down to 2256 errors.