tweaks, optimization