fixing a lot of issues