tons of fixes to late-night-coding induced errors