fixing everything