fixing... things