Tweaks, improvements