minor design tweaks
merge