Updated some immport and a few other small tweaks