merge tweaks into master