fixed a lot of import andwarnings