import and misc changes