fixed things that oyther people broke :(