fixing everything i did wrong