fixing everything!