fixed those things