Tweaks and improvements, as always.
Fixing conflicts