Fixed reload after swapout bug (I think?)
Fix more import bugs