module name fix
import fix
type comparison fix