meeting tweaks
merge