various tweaks in progress