0: more tweaks