Merging in the tweaks branch