fixed names and stuff
stuff