finish clean up ; forgot some things