fixing a lot more things
fixing