more cleanup and working background