fixed everything that was broken.
fixed everything again, now we're up to date