Cleaned up a lot of stupid mistakes (mostly typos or missing imports)