Merge latest and minor tweaks