various tweaks I really don't remember