tried to fix some of the things