merge interface tweaks