more cleanings and tweaks