Tweaking

Much more to be done later!