merge + tweaks