minor tweaks
merged