import/argument fixes and some other random cleanups