debugging import and other tweaks