Fixed many things that I forgot what they were