last tweaks
merge