Tweaks, more in progress