Fix imports; Fix README