more cleaning

and tweaking