minor tweaks
=merge fix