Tweaking and additions