finished fixing everything