fixed a bunch of missing imports.