added better variable completion