bugfixes
Allow custom imports.