fixed some of all the things