fixed most of the all the things