more cleaning
bugs again