more adjustments, tweaks