Fixed the things I broke while coding blidly