almost finished fixing and cleaning everything