universal direct import fix + various bug fixes