more tweaks, fixes