some import fixes, releasing v0.6