fixed stuff mmmkay